bitkeeper revision 1.1236.1.144 (42484459vNunHVt3PY-Uy-M3JRd0yw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 28 Mar 2005 17:52:25 +0000 (17:52 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 28 Mar 2005 17:52:25 +0000 (17:52 +0000)
commit18ab1824dc352491e2853423957e17987ef8a5c1
tree10b862a92a2ff9527b3a5e26514e056148f8cfbe
parent4cf79612e113cc3be906bde82265f20185c51660
parentcc49e1c47b26664aa56eafc0ce2eded78ea479ab
bitkeeper revision 1.1236.1.144 (42484459vNunHVt3PY-Uy-M3JRd0yw)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
xen/arch/x86/mtrr/generic.c
xen/arch/x86/mtrr/main.c
xen/arch/x86/smpboot.c